forked from fkanehiro/hrpsys-base
-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
【auto_stabilizer】 merge origin/master #76
Open
Naoki-Hiraoka
wants to merge
23
commits into
YutaKojio:auto-stabilizer
Choose a base branch
from
Naoki-Hiraoka:PR-merge-master
base: auto-stabilizer
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
【auto_stabilizer】 merge origin/master #76
Naoki-Hiraoka
wants to merge
23
commits into
YutaKojio:auto-stabilizer
from
Naoki-Hiraoka:PR-merge-master
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…_sensorpos [ImpedanceController] fix sensor localPos rotation
- Look for opencv4 via pkg-config - Migrate some OpenCV 1 code to OpenCV >= 2
Fix util build on Ubuntu 20.04
- The variable the module set is not used by hrpsys-base - This interferes with PCL's module on Ubuntu 20.04
Fix some CMake issues
…_profile [hrpEC/hroEC-common] fix memory leak
hrpsysext relies on Boost.Python and it can be difficult to: 1. Get it to work with the desired Python version 2. Let CMake find it Since those bindings are not always required, introducing this option allows to simplify the installation process
Introduce an option to skip hrpsysext build
Add an option to disable Irrlicht
Ports 'pgains' and 'dgains' will allow modifying the servo PD gains (of all joints) at each timestep.
[ModifiedServo] Create InPorts and OutPorts for pdgains
…-error-limit-with-jointId [SoftErrorLimiter/robot.cpp] check jointId >=0 in setServoErrorLimit
[RobotHardware/robot.cpp][robot::power] fix for robots which have a relay for each joint
kindsenior
approved these changes
Jun 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fkanehiro/hrpsys-baseのmasterを、auto_stabilizerにmergeします。
そのままPullRequestにするとCMakeLists.txtがコンフリクトするので、手元でauto_stabilizer側にあった以下のdiffが消えないようにコンフリクトを解消して、Naoki-Hiraoka/PR-merge-masterブランチとしてPushして、このPullRequestを出しました。